Do not call set-locale-environment until after terminal is initialized.

diff --git a/lisp/startup.el b/lisp/startup.el
index 5ee789657dad6eeeb5a91e46d5c58bba4ab5e25b..f4550310a871cef0c7a3b41a1c7b3cd3cb194963 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -621,8 +621,6 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
               (string= vc "simple"))
           (setq version-control 'never))))
 
-  (set-locale-environment nil)
-
   ;;! This has been commented out; I currently find the behavior when
   ;;! split-window-keep-point is nil disturbing, but if I can get used
   ;;! to it, then it would be better to eliminate the option.
@@ -673,6 +671,8 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
             (not noninteractive))
     (setq command-line-args (tty-handle-args command-line-args)))
 
+  (set-locale-environment nil)
+
   (let ((done nil)
        (args (cdr command-line-args)))